Merge "Align the lockscreen shortcuts haptics with the animation" into udc-dev