Re-add in-process-egl changes