Merge "Fix potential GLThread / GLSurfaceView memory leak."