Merge "Refactor LockSettingsService into storage and logic" into lmp-mr1-dev