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 am: 24aff93b38 am: 7dc6f5d90b am: 54d76e28af am: eb5735a9f5
am: 2e6f0631b0

Change-Id: I290534569e24ab11976444bd83e2dcf9c3f0460d