Merge "Do not pause scanning during Network state changes." into oc-mr1-dev