Merge pull request #35530 from surajshetty3416/fix-task-gantt