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

Change-Id: Id56059c188465f0f453bf2422d0d0107404248bf