Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1