Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952
am: f59ab362c5

Change-Id: I9b65bbed0946bb25b25772f24256dbe1f8fe022c