Merge "Don't rely on framebuffer contents after eglSwapBuffers"