Merge "[T8TSK-246][wifi]change gsw sta disconnet ap active" into GSW3.0-No-Connman