Merge "Update VirtualKeyMap usage"