Move blacklist & screenrecord option into SystemSettings
Settings: disable keyguard widget frame (2/2)

Change-Id: I23cd62d58d345278dc2b1dbeeefd574dc313e6c1
Revert "Custom lockscreen wallpaper [2/2]"

This reverts commit 2884f0d7ef4d504a347414db6912ebf2ad94066c.

Conflicts:
	res/values/pa_strings.xml
	res/xml/additional_settings.xml
	src/com/android/settings/AOSPAL/AdditionalSettings.java
	src/com/android/settings/SecuritySettings.java
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy

Conflicts:
	src/com/android/settings/AOSPAL/SystemSettings.java
	src/com/android/settings/SecuritySettings.java