Merge "Do not call eglMakeCurrent multiple times." into 2.0_beta