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

Change-Id: I0e6d25525a7e7ee4bab82e2b4ba2bb1b12d0c4a3