Merge "Remove injecting multi-user settings into settings itself" into main