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

Change-Id: Id0e1ed4f59480517df1bf95ad771db4d2ae878fe