Merge "BUG-1275: teach NormalizedNode builders about size hints"