Merge "Fix ImageWallpaper memory regression"