Merge "Fix NPE in UserSettingsTest" into sc-dev