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