Merge "libsnapshot: Add more feature flags to SnapshotMergeReport."