Merge commit 'c6f36ed547e7f480ea2484cc378698d4205b3155' * commit 'c6f36ed547e7f480ea2484cc378698d4205b3155': fix [1942438] eglGetCurrentSurface() returns bogus value
Merge commit 'c6f36ed547e7f480ea2484cc378698d4205b3155' * commit 'c6f36ed547e7f480ea2484cc378698d4205b3155': fix [1942438] eglGetCurrentSurface() returns bogus value