Merge upstream MG-SDL2 GameController fixes