diff --git a/osu-framework b/osu-framework
index 3ad1dd52ae..7131c54ea0 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 3ad1dd52ae511b816fb928f70ef811ec605c5c18
+Subproject commit 7131c54ea0a76ea03565ca93680487930c1c158a
diff --git a/osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs b/osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
index 2619ce150c..26d5146aae 100644
--- a/osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
+++ b/osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Mania.Timing
                 public override void InvalidateFromChild(Invalidation invalidation)
                 {
                     // We only want to re-compute our size when a child's size or position has changed
-                    if ((invalidation & Invalidation.Geometry) == 0)
+                    if ((invalidation & Invalidation.RequiredParentSizeToFit) == 0)
                     {
                         base.InvalidateFromChild(invalidation);
                         return;
diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 0cd6b8dd3a..e8bde11a3c 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -86,6 +86,6 @@ namespace osu.Game.Overlays.Chat
             }
         }
 
-        private void scrollToEnd() => Scheduler.AddDelayed(() => scroll.ScrollToEnd(), 50);
+        private void scrollToEnd() => ScheduleAfterChildren(() => scroll.ScrollToEnd());
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index dd135e43ef..516f65951c 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Mods
                     backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
 
                     backgroundIcon.Icon = modAfter.Icon;
-                    using (iconsContainer.BeginDelayedSequence(mod_switch_duration, true))
+                    using (BeginDelayedSequence(mod_switch_duration, true))
                     {
                         foregroundIcon.RotateTo(-rotate_angle * direction);
                         foregroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing);
@@ -88,7 +88,7 @@ namespace osu.Game.Overlays.Mods
                         backgroundIcon.RotateTo(rotate_angle * direction);
                         backgroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing);
 
-                        iconsContainer.Schedule(() => displayMod(modAfter));
+                        Schedule(() => displayMod(modAfter));
                     }
                 }
 
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index 11a964d179..ec94dced06 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
             set
             {
                 bounding = value;
-                Invalidate(Invalidation.Geometry);
+                Invalidate(Invalidation.MiscGeometry);
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 850c640770..2582c68296 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -25,13 +25,13 @@ namespace osu.Game.Screens.Edit
         protected override void OnEntering(Screen last)
         {
             base.OnEntering(last);
-            Background.Schedule(() => Background.FadeColour(Color4.DarkGray, 500));
+            Background.FadeColour(Color4.DarkGray, 500);
             Beatmap?.Track?.Stop();
         }
 
         protected override bool OnExiting(Screen next)
         {
-            Background.Schedule(() => Background.FadeColour(Color4.White, 500));
+            Background.FadeColour(Color4.White, 500);
             Beatmap?.Track?.Start();
             return base.OnExiting(next);
         }
diff --git a/osu.Game/Screens/Multiplayer/Match.cs b/osu.Game/Screens/Multiplayer/Match.cs
index 7da6ef800e..ec6a66062d 100644
--- a/osu.Game/Screens/Multiplayer/Match.cs
+++ b/osu.Game/Screens/Multiplayer/Match.cs
@@ -24,12 +24,12 @@ namespace osu.Game.Screens.Multiplayer
         {
             base.OnEntering(last);
 
-            Background.Schedule(() => Background.FadeColour(Color4.DarkGray, 500));
+            Background.FadeColour(Color4.DarkGray, 500);
         }
 
         protected override bool OnExiting(Screen next)
         {
-            Background.Schedule(() => Background.FadeColour(Color4.White, 500));
+            Background.FadeColour(Color4.White, 500);
             return base.OnExiting(next);
         }
     }
diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 43a8253b53..0b3bcc55a2 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Play
 
         public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
         {
-            if ((invalidation & Invalidation.SizeInParentSpace) > 0)
+            if ((invalidation & Invalidation.DrawSize) > 0)
                 layout.Invalidate();
             return base.Invalidate(invalidation, source, shallPropagate);
         }