Merge "Controls UI - Detail panel redlines" into rvc-dev am: cc5cb3dc16 am: 82d7f72672 am: 544848fa10

Change-Id: I559e12089607f573abca59d6da1452027fb68054