Merge "Fix wrong mapping of Brazilian KeyCharacterMap" into main