Merge "SF: Introduce LayerLifecycleManager"