Merge "Fix temporary black wallpaper after setting a new image wallpaper" into sc-v2-dev