Merge "Remove deadlock path between InteractionJankMonitor and FrameTracker" into sc-v2-dev