Merge "Fix concurrent calls occurs when E911 redial happens"