Merge "Remove VelocityTrackerTest from TEST_MAPPING" into main