Cherry pick joystick fixes from stable and fixup merge
Attach a file by drag & drop or click to upload
