Merge "Fix 6040870: Update MultiWaveView for new device" into jb-dev