Merge "Skip layer updates for layerless nodes"