Merge "Making AsyncClockEventDelegate a singleton" into main