Merge "Adding support for GLES3" into klp-dev