Merge "Add joystick support to framework."