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

Change-Id: Id6c3168ccbf272646f123090ab4fadab34b0f728