Merge "DO NOT MERGE Create a setting for backup/restore agent timeouts" into pi-dev