Revert "SF: detachLayer from Client earlier on destruction"

This reverts commit e338df1c2ff4ed2cd575a0e3193ef77c9cd9cb72.

Bug 27330889

Change-Id: I7e62ac2623bd0e1304f36a895ee2b5f9160e2a7e
1 file changed