Merge remote-tracking branch 'origin/master' into migrate-osu-game

osu.Game/Users/UpdateableAvatar.cs

@@ -40,11 +40,11 @@ namespace osu.Game.Users
         {
             displayedAvatar?.FadeOut(300);
             displayedAvatar?.Expire();
-            Add(displayedAvatar = new AsyncLoadWrapper(new Avatar(user)
+            Add(displayedAvatar = new DelayedLoadWrapper(new Avatar(user)
             {
                 RelativeSizeAxes = Axes.Both,
                 OnLoadComplete = d => d.FadeInFromZero(200),
             }));
         }
     }
-}
+}