Merge "ClientModeManager: set wifi state" into pi-dev