Merge "libsnapshot: op_count_max default to max blocks" into main