Merge "libsnapshot: use DeleteDeviceIfExists() when required"