Merge "Move Settings preferenceCategory style into SettingsTheme"