Merge "Overdraw avoidance in new pipeline" into nyc-dev