Merge "Fix missing summary for CheckBoxPreference"