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

Change-Id: I0620adfd74a98a82cbdb56666567706ceb90e6c5