Settings commit to go with QS cleanup

Change-Id: Ie064d70409b1c7b58bf08048fdc349318aee76d4
Cleanup: Use a helper class for system setting binary toggles.

Change-Id: Iad7f8a6bf85b23223e1def18e8c9eaa0f8dd253c