Merge "Revert^2 "Use timerfd to improve the accuracy of query timing"" into main