Merge "LockSettingsStorage: don't ignore insertion exceptions" into main