Merge "Opening Multiuser doesn't toggle it on" into rvc-dev am: f8fd6156ae

Change-Id: I33a68598516d6a7e1537e899ef173b6f46114171