Merge branch 'master' into toggle-multiplayer-leaderboard-with-hud

osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs

@@ -41,7 +41,7 @@ namespace osu.Game.Online.Multiplayer
         public string Password { get; set; } = string.Empty;
 
         [Key(8)]
-        public MatchType MatchType { get; set; }
+        public MatchType MatchType { get; set; } = MatchType.HeadToHead;
 
         public bool Equals(MultiplayerRoomSettings other)
             => BeatmapID == other.BeatmapID

osu.Game/Screens/OnlinePlay/Match/Components/MatchTypePicker.cs

@@ -30,8 +30,6 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 
             AddItem(MatchType.HeadToHead);
             AddItem(MatchType.TeamVersus);
-            // TODO: remove after osu-web is updated to set the correct default type.
-            AddItem(MatchType.Playlists);
         }
 
         private class GameTypePickerItem : DisableableTabItem