Merge "SF: Re-enable fence tracker by default" into nyc-mr1-dev