Merge "Refactor VirtualKeyMap"