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