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

Change-Id: I51145faa3d28ab2aee05914a5480a3f1576a8826