Merge "Controls UI - Better structure/app switching" into rvc-dev am: 1c31514ade

Change-Id: Ib32a9e1bd24d7195d295f9e6a0ed5b2d06f4461f