Merge "Fix enterDesktopWithDrag test" into main