Backported Mednafen PSX 0.9.36.1 changes