Merge "Revert "display: Store and restore the current eglContext""