Merge "Add haptic constants" into pi-dev