Merge "fix visualizer inactivity detection"