Merge "Remove raw coordinates VelocityTracker workaround"