Merge "Replace CheckBoxPreference with SwitchPreference" am: 777d4a22dc am: 09c74c603a am: cff664f3fd  -s ours
am: 64a0eeaeb6

Change-Id: Ib9f3a80406850501cef938e3ce059f4140d5cbaa