Updates to QuickSettings : Quick Collapse
Build V41.2-private
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Settings into cm-11.0

Conflicts:
	res/values/cr_strings.xml

Change-Id: I6d023910a41ea665bc992e9fdf22e2757f1ab7bc