Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2