Merge "Fix native crash when driver commands time out" into jb-mr1-dev