Merge "Controls UI - Fix colors" into rvc-dev