Merge "Controls UI - Better structure/app switching" into rvc-dev