Merge "Prevent GC requests from piling up in LockSettingsService" into main