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

Change-Id: I601dfc8770ea495228bcc6776b0c76a64f52de2b