Option to disable wallpaper service

Change-Id: Ia80ae699979a69cdf3497955967df59658cbe5bf

Conflicts:
	res/values/cm_strings.xml