Merge "Fix VibratorService waveform accumulated delay"