RemoveStageBarrier: revert change about tracking waiting tasks