Merge "WifiConfigManager: Allow setupwizard to modify proxy settings"