Merge "Use onTaskThumbnailChanged as sourced of truth for thumnbail override" into main