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

Change-Id: Ibfc04cf102256f0a114b9670550beee44254be14