Merge "Add support for additional international keyboard mappings"