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

Change-Id: Ia00f863047850395ee8375fc821ac2b84ed86843