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

Change-Id: Ic59a0ab61486e1a420988653e4276b3f5e660729