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

Change-Id: I658364d7223918d5757d61e2e9ce9f905e6a7627