Merge "Add lockscreen wallpaper support to SystemUI"