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

Change-Id: If160dfe824c4d32725eea44f1e13099c4238409a