Merge "Fix size caching bug in (Horizontal|Vertical)Grid" into main