Merge "Controls UI - Detail panel redlines" into rvc-dev am: cc5cb3dc16

Change-Id: I138c531e45559896c1a19b102c1d5878d75442ea