Merge 12 upstream ppy/osu commits (ours-priority) #2132

Job	Run time
Build only (iOS)	5m 59s
Build only (Android)	19m 40s
Test (Windows, windows-latest, MultiThreaded, rulesets, osu.Game.Rulesets.Osu.Tests/bin/Debug/**/...	15m 11s
Test (Linux, ubuntu-latest, MultiThreaded, rulesets, osu.Game.Rulesets.Osu.Tests/bin/Debug/**/osu...	10m 36s
Test (Linux, ubuntu-latest, MultiThreaded, game, osu.Game.Tests/bin/Debug/**/osu.Game.Tests.dll o...	1h 1m 15s
Test (Windows, windows-latest, MultiThreaded, game, osu.Game.Tests/bin/Debug/**/osu.Game.Tests.dl...	1h 31m 6s
Resource Budget (Source Overrides)	27s
Code Quality	11m 35s
Test results	13s
	3h 36m 2s

Navigation Menu