Settings: Fix NPE in QS on tablets

On tablets, onCreate is only called once, while onActivityCreated is called every
time the fragment is visible. So a second remove of a preferent will result in a NPE

Change-Id: I30205380018f29bd99270c707bd4f8ba03103648
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:
	src/com/android/settings/cyanogenmod/QuickSettings.java
[2/2] Settings: Add lockscreen ring battery setting

Change-Id: I68a9c4d7c8a49ec0568e8712e7f89d4114ae847a
Active display: Allow apps to be excluded from being displayed [2/2]

Change-Id: Ieb6368c050f5b46eec7398ab0162dc4fbf00a392

Conflicts:
	res/values/strings.xml
	src/com/android/settings/cyanogenmod/ActiveDisplaySettings.java

Conflicts:
	res/values-de/ck_strings.xml
	res/values/ck_strings.xml
	src/com/android/settings/cyanogenmod/ActiveDisplaySettings.java
Merge remote-tracking branch 'upstream/cr-main-10.2' into cm-10.2