Merge "Adapt ImageWallpaper to support lockscreen"