Merge "libsnapshot: resume_point_count" into main