It seems that the DOUBLE_CLICK and HEAVY_CLICK effects assume that `waveform_index` is always set to 1 and `vmax` is set to 1600, because if the last played effect is TICK, then all the other effects (aside from CLICK) end up feeling different, presumably because `waveform_index` is left as set to 2 and `vmax` is left as set to 1600. Fix this by having DOUBLE_CLICK and HEAVY_CLICK set `waveform_index` back to 1 and `vmax` back to 1600. Change-Id: Ic116f45894cf4af25bcd25b66764eeb472631af5