ENG-6043 SnapshotSave detects better an ongoing snapshot