Merge "Improve VelocityTracker bad pointer ID crash log" into main