Merge "Always set dialog width for SettingsAlertDialog"