Merge "4b/ Migrate TopTaskTracker to use visible running tasks from Shell" into main