Merge "Fix Blank task thumbnails during animation in following scenarios" into main