Squash in the latest from Nameless ROM

- http://gerrit.nameless-rom.org/#/c/3593/
- http://gerrit.nameless-rom.org/#/c/3594/
- http://gerrit.nameless-rom.org/#/c/3595/
- http://gerrit.nameless-rom.org/#/c/3724/
- http://gerrit.nameless-rom.org/#/c/3733/5

Change-Id: I1d9ec26063b3cd71fe12e01aeb918b7a2b4eea75

Conflicts:
	core/java/android/provider/Settings.java
	core/java/com/android/internal/util/ose/QSConstants.java
	packages/SystemUI/res/values/custom_strings.xml
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/ose_config.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
Addition
add/subtract