Merge "Make IMMS.SettingsObserver multi-user aware" into main