Merge "Map system shortcut keys"