Merge "Fix WindowContainerThumbnailTest" into rvc-dev