Merge "display: Store and restore the current eglContext"