Merge "Fix extension name for EGLImage colorspace support." into pi-dev