Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1