Merge "ImageWallpaper density and bug fix" into sc-dev