[TIMOB-17096] Update image of UIImageView when possible
[TIMOB-17270] Reverting change.
Merge pull request #5902 from cb1kenobi/timob-17270

[TIMOB-17270] Reverting change.
Merge pull request #5895 from vishalduggal/timob-17096

[TIMOB-17096] Update image of UIImageView when possible