Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev