Merge changes I56a0d747,I1585601a,I9e44330e into main

* changes:
  libsnapshot: move header op count setup
  libsnapshot: sync header metadata
  libsnapshot: update variable name