Merge "Fix driver stop handling" into jb-mr1-dev