Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5 am: d7822b3313 am: 9a5ec6b4c3 am: d959eb23c5 am: 5df594ca92
am: b2c00418d3

Change-Id: I4013cd1ddfabe63e01508ff16777b7abf68f6454