Merge "[SF] set render rate as peakFps when new display device is added" into main