Merge "opengles emulator: handle window surface resize"