Merge "EGL: Do not look up default namespace when sphal is defined" into oc-dev