Merge "Improve exception logging for system backup/restore" into sc-dev