Propely restore the vibration settings

Change-Id: I9d13dca46a93a0fa16bd7b19b31f2482d43bbaca
Merge "Propely restore the vibration settings" into kk