Merge "Fix non-offloadable effect creation on offload threads" into nyc-mr1-dev