Merge "Merge "Fixed the appearance of image messages that are out of view" into rvc-dev am: 3c2a6a281e am: 51ac1d4679" into rvc-d1-dev-plus-aosp am: 4d77a6ca99

Change-Id: I4570239ae578c364b032507713d12d2c4b8e8327