Merge "Fix GLES context version selection" into klp-dev