Merge "libsnapshot: update resume offset calculation" into main