Merge "Avoid duplicate surface creation."