Merge "Increase the time out for TimerTest" into main