Merge "Remove redundant transaction in Surface creation."