Inheritance layer re-design: Fix Bordered Nodes de-sync on layer change