Merge "Controls UI - Haptics fixes" into rvc-dev