Merge "Correctly map the drag view position to the Workspace" into main