Merge "Remove duplicate to-desktop call from HandleMenu" into main