Merge "Revert "Increase idle time out to 25s"" into jb-mr1-dev