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

Change-Id: I24fe2fa1dff2733d1338c8f34f0e5887cc15c608