Merge changes I00b54796,Iac465b72

* changes:
  Change max heap size to 48MB
  Fix memory leak in OpenGLRenderer.