Merge "Fix createSurface / eglCreateWindowSurface race." into jb-mr2-dev