Supersedes and closes https://github.com/ppy/osu/pull/35781. Closes https://github.com/ppy/osu/issues/36294.