Merge "Do not use raw coordinates in VelocityTracker"