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

Change-Id: I79a1ee45ecc0d4b538132266b27eb71561c29711