Merge "Ensure onHandleDestroyed drops reference before releasing lock."