Merge "Move more file handling into LockSettingsStorage"