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

Change-Id: I7e1d3ef9cfe6b1baa63ff4bf9653dc6ef789e766