Merge "Tune haptic feedback for quickstep when quickstep is enabled (1/2)"