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

Change-Id: I171ee6509854311dd71183c1b2226d8f4fa02171