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

Change-Id: I8b4eedd3a5b4cb3b72f20cbd55b6f2b0be5a7a83