Merge "Controls UI - Update strings to match latest guidance" into rvc-dev