Merge "libsnapshot: collapse fix sanity checks"