Merge changes Ie9436715,Ib3054822

* changes:
  Refactor RenderState and remove unused functionality.
  Fix crash when EGLSurface is no longer valid.