Merge "Enable haptic feedback from ILockSettings." into jb-dev