Merge "Create PercentLayoutInfo on demand if not already set." into mnc-dev