Merge "Add dynamic debug logs to VelocityTracker" into tm-dev