Merge "SF: Fix many flakes in IdleTimerTest"