Merge "Use raw coordinates in VelocityTracker"