Adjustments to CK Updater
Active display: Option to change display timeout [2/2]

Change-Id: I2cb0252dac6563517f28123f5de0a40f4bb824bc

Conflicts:
	res/values-de/ck_strings.xml
Settings: DE translation

Change translation after usage of AppOps for PrivacyGuard

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