Merge "Fix: Use original icon drawable for TaskThumbnailView" into main