Merge "Merge "Fixed the appearance of image messages that are out of view"...
Merge "Merge "Fixed the appearance of image messages that are out of view" into rvc-dev am: 3c2a6a28 am: 803be6f9" into rvc-d1-dev-plus-aosp am: 419ab47e am: 229970b9
Change-Id: I8a07efd7e23d6fbf13d0f6d42182dd70a78b61a0