Merge "Adding the haptic_volume_slider flag" into main