fix(core): Make feature flag buffer merging thread-safe

fix(core): Make feature flag buffer merging thread-safe #7587