Merge "Settings : Quick settings/Ribbons (Squashed commit)" into cm-11.0