Merge "LockSettingsService: migrate to its own keystore namespace" into sc-dev