Merge "Remove SettingsAppWidgetProvider and related resources"