Merge "Use std::unique_ptr in FileDescriptorTable" into main