Merge "Reconnect to In-Call if it dies." into mnc-dev