Merge "Revert "Inflate TaskThumbnailViewDeprecated as TaskContentView"" into main