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

Change-Id: I0df967353ef0dd28f75e91d210bd50b0eaf74a14