Merge "Controls UI - Multi-user switch updates" into rvc-dev am: 7604a184d9 am: ea4e36df74 am: ce22f75349
Change-Id: I83e5fee611b07b53dc83e6080379a4055eddbc0a
This commit is contained in: