Consolidate Junior and Water RC track code #1960

Job	Run time
Lint Commit Message	0s
Check code formatting	46s
Android	10m 47s
Linux (x86_64, AppImage)	7m 31s
Linux (Debug, [http, network, flac, vorbis OpenGL] disabled) using clang	9m 18s
Linux (Debug) using clang, coverage enabled	12m 40s
Linux (docker)	0s
macOS (x64) using CMake	7m 2s
Linux (x86_64, bionic, portable)	7m 44s
macOS (arm64) using CMake	6m 49s
Windows (win32)	8m 12s
Linux (x86_64, focal, portable)	7m 59s
Windows (x64)	7m 32s
Windows (win32) using mingw	8m 36s
Linux (x86_64, jammy, portable)	8m 37s
Windows (arm64)	8m 52s
Linux (x86_64, bullseye, portable)	8m 31s
Linux (i686, focal, portable)	7m 23s
macOS universal app bundle	1m 11s
	2h 9m 30s

Provide feedback