Per UX request, convert more CheckBoxes to Switches Change-Id: I04712bce4c0a54516d9ecedbb554f403fd6dd9e7