Merge "Some code cleanup of InteractionJankMonitor." into main