Merge "Add shortcut support to UserDictionaryLookup."