Merge "Fix spurious finalizer timeouts on shutdown."