am 5a588dbe: Merge "Fix 6486099: Fix clipping issues with MultiWaveView on...
am 5a588dbe: Merge "Fix 6486099: Fix clipping issues with MultiWaveView on phone/tablet" into jb-dev
* commit '5a588dbe':
Fix 6486099: Fix clipping issues with MultiWaveView on phone/tablet