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

Change-Id: I7c2ab62bff0590d328dd1a3fc550b6e389cc19e7