Fix NetworkStateHandler.notify being notified when it shouldn't
Merge branch 'feature/fix-connectivity-listener' into develop