Merge "Merge "Fixed the appearance of image messages that are out of view" into rvc-dev am: 3c2a6a281e am: 803be6f9d6" into rvc-d1-dev-plus-aosp am: 419ab47e0e

Change-Id: I38e5dcae8a769bf442a33cc71da8e92239ba3b67