Merge "Fix enabling networks after driver stop" into jb-mr2-dev