Merge "Add TaskContentView parent to TaskThumbnailViewHeader and TTV" into main