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

Change-Id: I6b1d4784df4f3c05fd9bb01189e8229c2d46afe6