Squash revert of Settings : Quick settings/Ribbons

Change-Id: Iab83d12c53e803d7135d70f85c0f9664d3c20c2e