Merge "Move KeyCharacterMap to enum class"