More QuickSettings stuff

Change-Id: I843ac9c1aebfade2fa24eec7a859a7e4e0da0711