Merge "Fix driver start/stop handling"