Merge "KeyCharacterMap: Avoid null dereference"