Merge "Add SurfaceControl.Transaction#setFrameRate API" into main