Merge "Make RecurrentTimerTest more stable." into main