Merge "Respect previously resolved size if layout has no size value" into sc-dev