Merge "Fixed the appearance of image messages that are out of view" into rvc-dev am: 3c2a6a281e am: 803be6f9d6

Change-Id: Iff9d34a9b3b986f630c7157c67d67ff783b8ac05