Merge "Skip dragging if app is already in default DesktopMode" into main