Merge "libsnapshot: Resume snapshot merge if snapshots are in second phase" into main