Merge "AllowDelayedLocking as long as run-in-bg allowed" into main