Merge change 6689 into donut

* changes:
  Don't crash the app when restore agent bringup throws