Merge change 21901 into eclair

* changes:
  Check for a timeout <= 0 before adding the vibration.