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

Change-Id: I9607061992408699810ee2e3da764b249fee5cf1