Merge "Fix visibility of AddUser when toggling multiuser."