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

Change-Id: I3c94a1d598ebafe7f89a9b259f4513c6ae466b73