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

Change-Id: Ic17615f09d8eafc7d6043dbea9141d62399e734a