Merge "Deprecate SurfaceControl.Transaction#setGeometry" into tm-dev