Add back lockscreen wallpaper.
Merge branch 'jb2' of git://github.com/CarbonDev/android_packages_apps_Settings into HEAD

Conflicts:
	src/com/android/settings/carbon/InterfaceSettings.java