Merge "Revert "Do not use unstable Android styable.CheckBoxPreference""