Settings: Lockscreen custom wallpaper (2/2)

Change-Id: I1ac1351e9a31a5827847e30113e933f2b7da219f
Merge branch 'cm/cm-11.0'

Conflicts:
	res/values/cm_arrays.xml