Merge "Per-pointer processing in VelocityTracker"