Merge "New haptic feedback constants" into oc-mr1-dev