Merge "Ensure layout resolution occurs when relative rules are removed"