Merge "Fix issue with floating tasks being tracked as a drag running task" into main