Merge "Handle dropped motion events in MultiWaveView due to high system activity"