Merge "Fix potential overflow in Visualizer effect" into klp-dev