Merge "Revert "Small fix: Use const value on IsHashreeDisabled"" into main