Settings: Forward port Slider shortcuts

Includes Change I683d9c22: Add the new lockscreen drawables to the
picker list by Bjorn Lunden (blunden)

Settings : Lockscreen targets alignment fix

Add separate layouts for different layouts to fix alignment issues.

Change-Id: I2453225e8a683244a1e11f0a8d3c18954ba5885f

Change-Id: I155824abc0578d98d3e2f1f5c2dcde3fa7b2ef84

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/settings_headers.xml