Merge "opengl: fix UAL conformity"