SDL: Merge commit 'b62642974595976a0c47c5b854eea51b2703fbeb' into main

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