Merge screensaver fix from upstream MG-SDL2