Merge "Don't crash when backup timeout races with agent completion"