Merge "Controls UI - Detail panel redlines" into rvc-dev am: cc5cb3dc16 am: 82d7f72672 am: 9014756b30 am: e40e0f789b

Change-Id: Id31a53109aead52a8ee16fc3cc699e0a56ac0bfc