Rebase fixes, cheats height fix #2579

Job	Run time
Check changelog formatting	7s
Check code formatting	41s
Get version info	23s
g2.dat	9s
Windows (win32)	8m 52s
Emscripten	14m 24s
Android	23m 7s
Ubuntu Linux (AppImage, x86_64)	9m 21s
Windows (x64)	9m 10s
Windows (arm64)	9m 37s
Ubuntu Linux (noble, debug, [http, network, flac, vorbis OpenGL] disabled) using clang	8m 12s
Ubuntu Linux (debug) using clang, coverage enabled	12m 43s
Ubuntu Linux (Docker)	1s
Ubuntu Linux (noble, x86_64, portable)	11m 2s
macOS (x64) using CMake	4m 37s
Debian Linux (bookworm, x86_64, portable)	10m 8s
Windows (win32) using mingw	9m 33s
macOS (arm64) using CMake	5m 2s
macOS universal app bundle	31s
Release	14s
	2h 17m 54s

Provide feedback