Merge "Remove obsolete WifiSettingsForSetupWizardXL"