Merge "Disable velocity-slowdown when timestamp API is enabled" into main