Fix LockScreen Wallpaper
Change to LockWallpaperPickerActivity.java to fix

Before this, selecting this option would only change phone wallpaper
Merge pull request #2 from timpohladthomas/patch-1

Change to LockWallpaperPickerActivity.java to fix
Settings: More shake sensitivity adjustments (2/2)

As requested by our users

Change-Id: I8543f4a103f312f0067f3c88e20e4d762ba4e813

Conflicts:
	res/values/liquid_arrays.xml
	res/values/liquid_strings.xml
Merge remote-tracking branch 'upstream/kitkat2' into kk44