gamepad id is in place
Merging upstream