Merge "Disable mouse support.  (DO NOT MERGE)" into honeycomb