Merge change Idfa47b56

* changes:
  Don't crash the system process when a backup transport unregisters