Merge "WifiNetworkFactory: Don't use WifiConfig from UI for matching" into rvc-dev