merge with master

diff --cc src/coreclr/src/vm/eventpipeprovider.cpp
Simple merge

diff --cc src/coreclr/src/vm/eventtrace.cpp
index ef7f471,0725580..026eec4
--- 1/src/coreclr/src/vm/eventtrace.cpp
--- 2/src/coreclr/src/vm/eventtrace.cpp
+++ b/src/coreclr/src/vm/eventtrace.cpp
@@@ -7616,12 -7612,7 +7616,12 @@@ bool EventPipeHelper::IsEnabled(DOTNET_
      }
      CONTRACTL_END
  
-     if (Level <= Context.EventPipeProvider.Level || Context.EventPipeProvider.Level == 0)
 +    if (!Context.EventPipeProvider.IsEnabled)
 +    {
 +        return false;
 +    }
 +
+     if (Level <= Context.EventPipeProvider.Level)
      {
          return (Keyword == (ULONGLONG)0) || (Keyword & Context.EventPipeProvider.EnabledKeywordsBitmask) != 0;
      }