Merge "QS: Make it possible to show smaller tiles (2/2)" into cm-11.0

(cherry picked from commit ac59a3045dc507afa68f3d9915c20f8b352802ea)

Conflicts:
	res/values/cm_strings.xml
	res/xml/quick_settings_panel.xml
	src/com/android/settings/quicksettings/QuickSettings.java
Merge branch 'cm-11.0' of https://github.com/096-NET-UKRAINE/android_packages_apps_Settings into cm-11.0