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

Change-Id: Ic072bb1974503dad3aa5476706910ddcb082cdb5