Merge "Controls Ui - Handle error scenarios" into rvc-dev