Merge "Replace CheckBoxPreference with SwitchPreference" into oc-dev