Merge "To modify the icon on SettingsAlertDialogWithIcon" into main