Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev