Merge "Disable write-ahead log on LockSettingsStorage" into sc-dev