VID-1875 normalizing lazy loading between video and image rendering so they both work the same
VID-1875 cleaning up implementation
Merge pull request #4332 from Wikia/VID-1875-cherry-pick

Vid 1875 cherry pick