Refactorings and improvements - expose AnalyticsSettingsService and UserSettingsServiceBase