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

Change-Id: If281f8f8da824c1f0653e9560c936fb05d1b52c2