Revert "Extended QS Options: fix force close on theme changes"

This reverts commit 1fb1e381a5b2e1f90ff3bb131e4ff57c159ee144.

Conflicts:
	packages/SystemUI/res/values/cr_dimens.xml

Change-Id: I546353828e6a296f3cf525d1f30c26ba71e38469
Revert "Extended QS Options (1/2)"

This reverts commit cf0fbd582d9020aad4f31e49c6c0cb20e6f092c1.

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/cr_dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: Idbf428676367a44f7ddf4e53be2880ffcbc4dbae