Merge "AnrTimer errors are now managed in a RingBuffer" into main