Patch Set 6 Quick Settings