Merge "Request correct rendering type for EGL config"