Merge "Fix Bitmap leaks in ImageWallpaper" into lmp-mr1-dev