Merge "don't error out when eglTerminate()ing an already terminated display"