Merge "Fix layout for WifiSettingsForXL"