Merge "WifiManager/WifiScanner: Misc API cleanup"