Merge "Add a flag to protect headless user 0 multi-user model." into pi-dev