Quicksettings cleanup

Change-Id: I612f1072fae03a9f5e0ca3f099849efbe34270c2