Bug 1057498 - Ensure we wait for the image