Merge changes from topic 'SF: Fix a couple of Layer ref count issues'

* changes:
  SF: Change wp usage for deferred transactions in the interceptor to sp
  SF: Fix a couple of Layer ref count issues