Cherry pick joystick fixes from stable and fixup merge