Merge "Fix redlines and strings in Controls dialog" into rvc-dev