Merge "SF: add render frame rate dimension to RefreshRateSelector"