Merge "libsnapshot: Wait for daemon to terminate after snapshot unamp"