Merge "Connect WifiScanner synchronously without sync barrier" into nyc-dev