Merge "Remove obsolete MultiWaveView"