SDL: Merge commit '3b0c86a36fd97d4fddc8d025d0473a7a6c6de3ca' into main

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