Merge "Fix flag on network state change broadcast" into jb-dev