Merge "SF: detachLayer from Client earlier on destruction"