Merge "Store SurfaceControl reference when creating transactions"