Merge "Revert "Ignore config error if non-offloadable effect is on offload thread""