[Snapshot V2] Do orphan timestamp cleanup before completing the snapshot

[Snapshot V2] Do orphan timestamp cleanup before completing the snapshot #1357