Merge "WifiNetworkFactory: Defer disconnecting from connected request"