am 0e14f2d4: Merge "Remove obsolete MultiWaveView"

* commit '0e14f2d45557527242f27ce7de9027e6ccaa45d6':
  Remove obsolete MultiWaveView