Merge "Rename SettingsPreferenceTheme to PreferenceTheme.SettingsBase" into sc-dev