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

Change-Id: I977223979cb4ba8365956081b5ee74d909f59554