Merge "Cleaning up the accessibility of MultiWaveView"