Merge "Revert "Revert "Listen for SimultaneousCallingTracker updates in..."" into main