Merge branch 'scummvm:master' into sci-pcjr-volume-fix #628

Job	Run time
Xcode (macosx, -scheme ScummVM-macOS -destination 'platform=macOS,arch=x86_64', --disable-nasm --...	17m 43s
Windows (win32, x86-windows, x86, --enable-discord --enable-faad --enable-gif --enable-mikmod --e...	34m 48s
Ubuntu (ubuntu-latest, sdl2-config, ccache g++, liba52-dev libcurl4-openssl-dev libfaad-dev libfl...	3m 28s
Xcode (ios7, -scheme ScummVM-iOS CODE_SIGN_IDENTITY="" CODE_SIGNING_ALLOWED=NO, --use-xcframework...	13m 37s
Windows (x64, x64, x64-windows, --enable-discord --enable-faad --enable-gif --enable-mikmod --ena...	21m 0s
Ubuntu (ubuntu-20.04, sdl-config, ccache g++-4.8, g++-4.8 liba52-dev libcurl4-openssl-dev libfaad...	3m 11s
Windows (arm64, arm64, arm64-windows, --enable-discord --enable-faad --enable-gif --enable-mikmod...	18m 58s
	1h 52m 45s

Provide feedback