Merge "Controls UI - Haptics for touch/drag events" into rvc-dev