Merge change I9485aec1 into eclair

* changes:
  Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen