Settings: Option to disable wallpaper service (2/2)

Change-Id: Ia80ae699979a69cdf3497955967df59658cbe5bf

Conflicts:

	res/values/cm_strings.xml
	res/xml/performance_settings.xml
	src/com/android/settings/cyanogenmod/PerformanceSettings.java

Conflicts:
	res/values/cm_strings.xml
	res/xml/performance_settings.xml
	src/com/android/settings/cyanogenmod/PerformanceSettings.java
Merge branch 'jellybean-legacy' of github.com:TheMrcool212/android_packages_apps_Settings into jellybean-legacy