Merge commit 'eb248a58fabac31873982e4f389ba81981f4041f' * commit 'eb248a58fabac31873982e4f389ba81981f4041f': fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
Merge commit 'eb248a58fabac31873982e4f389ba81981f4041f' * commit 'eb248a58fabac31873982e4f389ba81981f4041f': fix [2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().