Fix Stop/Disconnect on Idle Timeout feature

The Stop/Disconnect on Idle Timeout feature doesn't work anymore in the current (4102f1cf7898dae96f3785d3a196276e5627ffae) snapshot. This change fixes it.
I haven't created a JIRA issue for it because it's a prerelease and I don't have a JIRA account yet.