Merge "Fix VibratorManager cmd for on-off waveforms" into tm-dev