Merge "Introduce separate setting key for hardware haptic feedback"