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