Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev