Merge "Controls UI - Redlines for setup screens" into rvc-dev