* commit '2b5cebebb60c33fe864bed71778253837cbddb54': Fix 6040870: Update MultiWaveView for new device