Merge "SurfaceFlinger: Consider resolution when switching refresh rate" into rvc-dev