Merge "Only relayout when mIgnoredSlots changes"