Merge "Use SettingsAlertDialog for app button dialogs"