Merge "Allow defining replacement key events in keymap" into mnc-dr-dev