Merge "Improve VelocityTracker Strategy Handling"