Merge "Changed management to just show all controls" into rvc-dev am: d37dcf856b am: 2418ab1427 am: cef40a73e6 am: 0fb06adcee
Change-Id: I8e4ac1ff2785fe57ef3172b35975f909805c1ef7
This commit is contained in: