Merge "libsnapshot: Propagate merge phase across merge failures."