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

Change-Id: I65ba08407c1a3f865222b2ff42b68e5038c28b88