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

Change-Id: Ibc702cb0bd10ea7076c821b4093a7443531457f3