Merge "Use the non-override task progress for calculating the z." into nyc-dev