Settings: Lockscreen custom wallpaper (2/2)

Change-Id: I1ac1351e9a31a5827847e30113e933f2b7da219f
Revert "Settings: Lockscreen custom wallpaper (2/2)"

This reverts commit 3538a6691bdda46b436f1185c86e1bfb1af2c753.
Merge commit '010fe4a' into HEAD