Merge "Listen for network disconnect." into jb-mr2-dev