Merge "Fix network reload when config is restored" into jb-mr2-dev