partially fix async loading and rendering of images
Merge branch 'fix-image-load'