Merge "Controls UI - Update text colors" into rvc-dev