am d4da50f1: Merge "Fix default image not displaying prior to load"

* commit 'd4da50f120b998a968944bc819fa3763262887f2':
  Fix default image not displaying prior to load
Merge commit 'aad56dda40dca1d9b6418ef48f12257101b2c7b2' into HEAD
Merge commit '379c1aec119acef172452b17dca481cedb86ba0f'