Merge "Exclude children from excess space distribution when using largest child" into nyc-dev