Merge "VelocityTracker Cleanups: Differential Axes Support Follow Up"