Merge "Controls UI - Multi-user switch updates" into rvc-dev