QuickSettings : Cleanup

Change-Id: I044f8c0914c725af5894ffb70e8ac54b6e19dc43