Merge "Changed management to just show all controls" into rvc-dev am: d37dcf856b am: a0945729c8 am: ca32131d53 am: 0a4265438d
Change-Id: I248c18f34511d0177291b45a29f2469271a02d0d
This commit is contained in: