Merge "ImageView ResourceReady logic update" into devel/master