Merge "Replace SurfaceControl call points with Transaction calls (1/n)"