Merge "Fix generate layout params to preserve margins" into nyc-dev