Merge "Add controller numbers for gamepads / joysticks"