Merge "ZeroJank: Make version-gate flag non-static" into main