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

Change-Id: I038d377d8489b95f6eb119f27fd968e97bd83b14