Merge "Add a new SettingsCategoryPreference style" into rvc-dev