Merge "Fix 5355659: Minor tweak to wave ping radius in MultiWaveView." into ics-factoryrom