Merge "Replace CheckBoxPreference with SwitchPreference" into oc-dev
am: ed5b4af1c9

Change-Id: I82cd4fe9d35b9af00ad4f7b98a736d4ee77a52b1