Merge "Catch egl errors when drawIntoSurfaces"