Merge "Add a setting to control multi-user feature on/off."