Merge "Adding MSDL haptic feedback to flexiglass lockscreen interactions." into main