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