[Bug 225949] Merge Review: joystick