Merge "Fix race condition in Effects"