Merge "Fix bug in LockSettingsService" into sc-dev