Merge "Settings: remove usage of WifiConfig helper methods"