Merge "Trigger unbindBackupAgent if app dies during backup"