Merge "Allow clicks on the custom widget in CheckBoxPreference" into nyc-dev