Attempts to deal with waiting for image to set height

Another pass at dealing with the height part of [#53567925]. If the image is loaded, run the adjustment right away; otherwise defer until it's ready.

https://www.pivotaltracker.com/story/show/53567925