QuickSettings: cleanup baked settings side to match up with the framework commit

Signed-off-by: travp624 <travp624@gmail.com>