Merge "libsnapshot: Simplify wipe handling in recovery." into main