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

Change-Id: Iceb75ab4f4bc0c3825358251f50ca3c90e51e84a