Merge "Ensure hierarchy is measured on applying insets"