Merge "Fix Visualizer capture size reset in wraparound" into main