Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b009e am: 6732f45ee9 am: 24566f2939 am: 25a681e678
am: 73895e0b02

Change-Id: I5770281efd6e83a2cb0ed40b16436625b3c10da8