Merge "Plumb new frameRateSelectionStrategy value" into main