Merge "Display shortcut modifiers in menu" into pi-dev