Merge "Revert "Prevent agents from delaying system daemon threads""