Merge "Use measure caches during force layout traversal" into main