Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev
automerge: e6ef98c

* commit 'e6ef98cf0528cbc2722b979e5ad86ba859fa78b0':
  Add caching to LockSettingsStorage