SDL: Merge commit '3d22731d94d6259255ef3fd5006c8c6c80e377b4' into main

[Couldn't obtain the patch due to network issues; please check the above link instead.]