Merge commit '7d638292969687ed4557d36e741e1275d2052fb0' * commit '7d638292969687ed4557d36e741e1275d2052fb0': Change way we choose EGL surfaces to be compatible with the native
Merge commit '7d638292969687ed4557d36e741e1275d2052fb0' * commit '7d638292969687ed4557d36e741e1275d2052fb0': Change way we choose EGL surfaces to be compatible with the native