Merge "Make timer tests less racy" into feature/zuulv3