Merge "Prevent reiterating over same stack tasks when calculating running tasks"