Merge "Fix memory leak due to un-released gralloc buffers" into main