Merge "Updating reconnect retry code for InCallUI." into klp-dev