Merge "Remove duplicate language switch shortcut" into main