timob-11762: imageView should update images correctly
timob-11762: addressed comments
Merge pull request #3689 from hieupham007/timob-11762

timob-11762: imageView should update images correctly