Merge "Support TaskOverlay with new TaskThumbnailView" into main