Merge "Add release haptic to nav bar buttons" into oc-dr1-dev