Merge "Increase restore timeout for system agents"