Merge "Generalized AppWindowThumbnail as WindowContainerThumbnail"