Merge "Handle uncaught exceptions in BackupHandler"