Merge "Support buildLayer in new pipeline" into nyc-dev