Merge "Remove base-zero pattern migration in LockSettingsService"