QuickSettings: clean up a bit

Change-Id: Iaf662834abb74e8ac1bb9c32d05fdab2f04b11da