Merge "Add null check for original telephony connection before closing."