Merge "Controls UI - Fix icon, title, subtitle for error states" into rvc-dev