Merge "SF: Prevent non-sync transactions from syncing" into nyc-dev