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

Change-Id: Id59aed6b60e3534bbc11b96c51f6dcca98f0b834