Merge "Settings: Clean up WifiManager APIs"