We want to make this aosp...

...move the check box preferences to Oct Settings so they can be hid.