Merge "SF: Carve out LayerHandle"