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

Timob 11762 3 0 x: imageView should update images correctly