Merge "Recover immediately from driver hang" into jb-dev