Merge "EGL: Grab relevant upstream colorspace changes"