Merge "Fix enter-desktop-by-drag cuj to only cancel when aborted." into main