Merge "SF: Break dependency between VsyncConfiguration and RefreshRateConfigs"