merge sdl interface changes into SDL2 interface