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

Change-Id: I26a8c41c80df5d964c566e8ada5c4f5602c1ef0d