Merge "Fixed the appearance of image messages that are out of view" into...
Merge "Fixed the appearance of image messages that are out of view" into rvc-dev am: 3c2a6a28 am: 803be6f9 am: caa74785 am: bda1b573 am: c61cbd43
Change-Id: Id09c1b6bc6172aece25f414f651ded31281c98ae