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

Change-Id: I7a7bb146beb3eda49aacd8bc388a7b55cd1ba944