Merge "Skip eglSwapBuffers() call when we do not draw to GL" into jb-dev