timob-14777: Fix ImageView crashes.
Merge pull request #4657 from hieupham007/timob-14777-3_1_X

Timob 14777 3 1 x