Merge "Keyboard Shortcuts Helper: Find device with KeyCharacterMap" into nyc-dev