Merge "Changed management to just show all controls" into rvc-dev am: d37dcf85 am: a0945729 am: e9e43d2f Change-Id: I5338314de725142800d53cf993110060527c1a5f