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

Change-Id: I2ebc5ae1949113d18501dad46cea7577f10c9782