Merge "Controls UI - Multi-user switch updates" into rvc-dev am: 7604a184d9 am: 44f3e98c7b am: 2bda35002e
Change-Id: I77b92291c045cb14e47c377f0a5e11bf23d6a583
This commit is contained in: