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