Merge "Replace CheckBoxPreference with SwitchPreference" am: 777d4a22dc
am: 09c74c603a

Change-Id: Id757156c84f85009f94952cd26bb9f8a5a129f37