Merge "Fix layout params resolution"