Merge "Fix NPE in requestKeyboardShortcuts"