Merge "Switch back to lsq2 VelocityTracker strategy."