Merge "Refactor key code mapping."