Merge "Change style for CheckBoxPreference"