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

Change-Id: I35c0e6e04f48e0ea62d7eb375f619bf58f0e0501