Merge upstream ppy/osu master (3 commits) — prioritize winnerspiros fork #2155

Job	Run time
Resource Budget (Source Overrides)	29s
Build only (Android)	15m 40s
Build only (iOS)	4m 18s
Test (Linux, ubuntu-latest, MultiThreaded, rulesets, osu.Game.Rulesets.Osu.Tests/bin/Debug/**/osu...	10m 43s
Test (Linux, ubuntu-latest, MultiThreaded, game, osu.Game.Tests/bin/Debug/**/osu.Game.Tests.dll o...	5m 23s
Code Quality	11m 31s
Test (Windows, windows-latest, MultiThreaded, rulesets, osu.Game.Rulesets.Osu.Tests/bin/Debug/**/...	18m 41s
Test (Windows, windows-latest, MultiThreaded, game, osu.Game.Tests/bin/Debug/**/osu.Game.Tests.dl...	1h 30m 54s
Test results	8s
	2h 37m 47s

Navigation Menu