Revert: Add App Ops shortcut to settings
Active display: Option to change display timeout [2/2]

Change-Id: I2cb0252dac6563517f28123f5de0a40f4bb824bc
AOKP custom system animations (2/2)

ported fom here: http://gerrit.aokp.co/#/c/12305/

Thanks to Steve Spear

Change-Id: Ic93fc795c4600784a423f2e9b5b1984c7aabb7cb

Conflicts:

	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/SettingsPreferenceFragment.java