Merge "Fix NPE in InteractionJankMonitor." into sc-dev