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

Change-Id: I0d4ef7c918f858f59bc661c757cc87bb9fdd7de9