Merge "Reduce transaction to sf when creating surface"