Merge "Remove haptic primitives that aren't ready yet." into rvc-dev