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

Change-Id: I1a5fbff1f31eef8b60b514b248ae064d3b08fd9f