Fix clipping box for indicators
Upgrade perf to display only visible part of indicator
Merge