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