[Bug 225949] New: Merge Review: joystick