Merge "Attempt to unhold remaining holding call on disconnect (2/2)" into lmp-dev