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

Change-Id: I42c1d6222a2fea0f9f239d9199b0ffaca40e7c9c