Merge "Apply SettingsPreferenceTheme in Settings" into sc-dev