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

Change-Id: I515d31d1f619aff93867da9d7b256999b238474d