Merge "Revert "Add SimultaneousCallingTracker"" into main