Merge "Extend MenuItem to allow modifier keys for shortcut"