Merge "MiltiWaveView accessibility improvement." into ics-factoryrom