Merge "Revert "SF: detachLayer from Client earlier on destruction"" into nyc-dev
am: 99dccfc3ec

* commit '99dccfc3ec4b304d1ee3497ecbcc3322a84cf606':
  Revert "SF: detachLayer from Client earlier on destruction"