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

Change-Id: Ic54e9ea256816aa10c60a730b5e03e183d0a03fd