ENG-5843: Move snapshot scan out of SnapshotSave