Fix Derp

Change-Id: I1b774c7a6db77098db8348c101e7542d4397803a
merge changes from CyanogenMod 10.2 into local branch

Conflicts:
	res/xml/system_ui_settings.xml
	src/com/android/settings/cyanogenmod/SystemUiSettings.java

Change-Id: I7787430bba289429bcddacabd51cc73dfbf49fdf
merge changes from CyanogenMod 10.2 into local branch
merge changes from CyanogenMod 10.2 into local branch