Merge "Fix WindowContainerThumbnailTest" into rvc-dev am: efda8ff71a

Change-Id: Ida55202b3a10b63a6ce8dd87a6fc603e4925ddfa