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: 51ac1d46" into rvc-d1-dev-plus-aosp am: 4d77a6ca am: 2c5b70aa
Change-Id: I725494577a73f3ed9f4e587c26ab9c3418c61877