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

Change-Id: I52b29322157a53210d5b975acb58401915a2bb06