Merge "Replace CheckBoxPreference with SwitchPreference"
am: 777d4a22dc

Change-Id: Ide3f56f063d5a7ceff14732c72c9bcdaa1085788