Merge "Add a switchbar to turn off multi-user feature entirely"