Merge "Revert "Make VelocityTracker 1D""