Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev