Settings : Quick settings/Ribbons (Squashed commit)

Port forward settings for quicksettings/ribbons

Patchset 7: Point to more fitting drawables (blunden)

Change-Id: I2d4659337f48338547a4e6c1efb8b32122319fe3

Add back preference for drawer collapse behaviour

Change-Id: Ic6fa8531f9119447853e2dd3fa033924f0d37091
Merge "Settings : Quick settings/Ribbons (Squashed commit)" into cm-11.0
Settings: Set some more strings to translatable="false"

Change-Id: I7483044aa396b3c18b2cabf5715dea41ec44ca5b
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	res/values/cm_strings.xml

Change-Id: Ib2362b0ce7306979a84fd928fa0b424604484a68