Merge pull request #8473 from jordan-woyak/evdev-combine ControllerInterface: Combine evdev devices with the same unique ID.
