Merge "Fix default image not displaying prior to load"