Merge "Update nintendo joystick layout" into rvc-dev