SF: Prevent accidentally re-adding a removed layer

Bug 25887783

Change-Id: Ib13ebdfb55d40c0f2175b2bc521214a07281e69a
1 file changed