Merge "SurfaceFlinger: getRefreshRateForContentV2 always returns valid config" into rvc-dev