Merge "SF: Prevent accidentally re-adding a removed layer"