Settings half of custom wallpaper commit

Cm's TE relies on it / allows custom themes to change lockscreen wallpaper

Change-Id: Iba73f28fddbb6950a5f64eef27023d958e222e4c
Cleanup

Change-Id: I147d9fd25561a0fbaaddf55f27208ae7d3685ea0