Merge "Fixed the appearance of image messages that are out of view" into rvc-dev