Merge "Use privateFlags for the preserve geometry check" into nyc-dev