* commit '5a588dbe6e3d246523d7c04258f0129ba37df069': Fix 6486099: Fix clipping issues with MultiWaveView on phone/tablet