Merge "Fixing wallpaper preview rendered not being cleaned properly" into main