Merge "Fix overflow sanitizer in EffectVisualizer." am: d5285db072
am: 1524707b8f

Change-Id: Ib6b7c430159ca2162f04b3957f7e8d8cbb1ee0f1