Merge "Remove ProxyFileDescriptorCallback in onRelease" into main