Merge "Remove outdated logic of task reparent" into main