Merge "Ensure ImageView updates mVisual once ready/loaded" into devel/master