Merge "Using InteractionJankMonitor only in S+" into sc-dev