Backport "Quick Settings" from CM10.1 Part2 (Cleanup)