Merge "Do not use unstable Android styable.CheckBoxPreference"