Merge commit 'dded214eb92cebdd7fb2e6405173ffc1932e795a' * commit 'dded214eb92cebdd7fb2e6405173ffc1932e795a': Don't crash the app when restore agent bringup throws
Merge commit 'dded214eb92cebdd7fb2e6405173ffc1932e795a' * commit 'dded214eb92cebdd7fb2e6405173ffc1932e795a': Don't crash the app when restore agent bringup throws