Merge "revert to using a pbuffer as the dummy egl surface"