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

Change-Id: Ic6f21e4536be81b17fd41ebe78515a3a93ea9a8f