Merge "WifiNetworkSpecifier: Ensure we don't match a regular wifi network" into rvc-dev