Merge \"Fix non-offloadable effect creation on offload threads\" into nyc-mr1-dev
am: b28d6117a5

Change-Id: I273585d967945cadddcd70d10514dabb64b1f2e3