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

Change-Id: Id09c1b6bc6172aece25f414f651ded31281c98ae