Merge "libsnapshot: Don't accidentally delete snapshot when collapsing"