Settings : Quick settings / Ribbons

Port forward settings for quicksettings/ribbons

Change-Id: I2d4659337f48338547a4e6c1efb8b32122319fe3

Conflicts:

	res/xml/settings_headers.xml

Patchset: 4
http://review.cyanogenmod.org/#/c/53648/