Do not save the cookie twice.
OEHIDEvent now references the device handler that created the event rather than a pad number.
Merge remote-tracking branch 'upstream/master'