Merge "Prevent re-adding call disconnected before block check completes." into nyc-mr1-dev