Merge change 5352 into donut

* changes:
  fix [1942438] eglGetCurrentSurface() returns bogus value