Merge "Controls UI - Better structure/app switching" into rvc-dev am: 1c31514ade am: 1d44a20e04 am: 98a3bd6140 am: 37b0ec8d39 am: 9cf687a330

Change-Id: I86c27485f7f763918b6f99ba16410bf21a92693c