Merge "Fix potential NULL dereference in Visualizer effect" into security-aosp-mnc-mr1-release