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

Change-Id: I3301619e2f88016fe15385ed5022d4187d291648