Merge "Changed management to just show all controls" into rvc-dev am: d37dcf85 am: 2418ab14 am: cef40a73 Change-Id: I1f8d23523a22ff7618c0ae09f61f9f590235f5f3