Merge changes Ic124b5c6,I36eead3e

* changes:
  Add VelocityTracker Support for AXIS_SCROLL
  VelocityTracker Cleanups