Merge "Add SurfaceControl::setFrameRateSelectionStrategy" into main