Merge "Fix possible deadlock between effect and af lock"