Merge "Fixing memory leak in RenderBufferCache"