Merge "WifiNetworkFactory: Handle concurrent connection to same ssid" into sc-dev