Merge "Fix 5044158: Turn off debugging in MultiWaveView."