Merge "Fix for gles3 glTexImage2D format" into pie-cts-dev