Merge "Add flag for "move to next display" shortcut in desktop" into main