Merge "Mapping of haptic constants updated" into pi-dev