Comment 2 for bug 1987873

Note when testing I added some temporary logging to confirm the wait_time eventually returns to -1 when no more activity or child maintenance is needed. I did not test any message backlog scenarios, though.