FIX: [droid] re-add default joystick keymap
Merge pull request #5301 from koying/quickpr

FIX: [droid] re-add default joystick keymap