Merge "Controls UI - Better structure/app switching" into rvc-dev am: 1c31514a am: 1d44a20e am: 98a3bd61 am: 37b0ec8d Change-Id: I24fe2fa1dff2733d1338c8f34f0e5887cc15c608