Merge "create_snapshot: Reorder digest calculation" into main