Merge "Fix BackupManagerMonitor wrapping in RestoreSession" into oc-dev