Idle Timer: fix the last cherry-pick