Change idle timeout to timer

Get this timeout in to the timer system as well to make things
simpler and more robust.
3 files changed