Merge "Controls Ui - More string adjustments" into rvc-dev