Merge "Changed management to just show all controls" into rvc-dev am: d37dcf856b am: 2418ab1427 am: cef40a73e6
Change-Id: I1f8d23523a22ff7618c0ae09f61f9f590235f5f3
This commit is contained in: