Merge "Localize the removal of root tasks to default TDA in tests" into main