Merge "Display shortcut inline with item title in cascading menu" into pi-dev