Merge "AdvancedSettings replaced by AdvancedWifiSettings"