Merge "Add scrim to TaskThumbnailView" into main