Merge "Controls Ui - Redline adjustments" into rvc-dev