Merge branch 'master' into fix-toolbar-bar

osu.Game/Overlays/SettingsSubPanel.cs

@@ -34,6 +34,8 @@ namespace osu.Game.Overlays
             });
         }
 
+        protected override bool DimMainContent => false; // dimming is handled by main overlay
+
         private class BackButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
         {
             private AspectContainer aspect;