Revert "Settings: Fix QuickSettings Style NPE"

This reverts commit 048c112277de34d351cee6b599620b753544bfb3.

Conflicts:
	res/xml/quicksettings_tiles_style.xml

Change-Id: Ia553bbe7da4efc2a0408a74e49c5c0edbf657ffd
Revert "Extended QS options (2/2)"

This reverts commit 8efeab148a9a9345bcf1d969658e0a5528137e0c.

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml

Change-Id: Ie4cba78d7dbce5e680a69f2eb209ef720a185e16
QS: Make it possible to show smaller tiles (2/2)

Change-Id: I19e7f3fb4c1b0e2bcae14942eb98e039cec46d67

Conflicts:
	res/values/cm_strings.xml
	res/xml/quick_settings_panel.xml