Merge "EGL: two fixes for colorspace attribute handling"