Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev