Merge commit '818d7fedf1ff6bcfa005a1fc67627b63353ffbc7'

Author: Mirroring

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/AppContextDefaultValues.cs

@@ -74,8 +74,9 @@ private static void InitializeNetFxSwitchDefaultsForNetCoreRuntime()
             LocalAppContext.DefineSwitchDefault(FrameworkAppContextSwitches.KeyboardNavigationFromHyperlinkInItemsControlIsNotRelativeToFocusedElementSwitchName, false);
             LocalAppContext.DefineSwitchDefault(FrameworkAppContextSwitches.ItemAutomationPeerKeepsItsItemAliveSwitchName, false);
             LocalAppContext.DefineSwitchDefault(FrameworkAppContextSwitches.DisableFluentThemeWindowBackdropSwitchName, false);
+            LocalAppContext.DefineSwitchDefault(FrameworkAppContextSwitches.DisableDynamicResourceOptimizationSwitchName, true);
 
-            // UseAdornerForTextboxSelectionRenderingSwitchName is always true, i.e., disabled by default. 
+            // UseAdornerForTextboxSelectionRenderingSwitchName is always true, i.e., disabled by default.
             // Do not initialized this again - this was initialized earlier in PopulateDefaultValuesPartial unconditionally.
             // LocalAppContext.DefineSwitchDefault(FrameworkAppContextSwitches.UseAdornerForTextboxSelectionRenderingSwitchName, true);
         }