Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev