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