Merge pull request #8840 from Techjar/evdev-combining-phys ControllerInterface: Combine evdev devices with the same physical location in addition to unique ID
