Fix network change crash
Fixes observers never getting removed
Merge branch 'feature/KVO_crash_fixing' into develop

* feature/KVO_crash_fixing:
  Fixes observers never getting removed
  Fix network change crash