Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev