Merge "Fix WindowContainerThumbnailTest" into rvc-dev am: efda8ff71a am: 0bfd0d2703 am: 40013a7195 am: 168b81f9dc

Change-Id: Ibee4224a9a71cc7362d4d1f30126a95e6138fe8c