Merge "SurfaceFlinger: fix refresh rate override when changing refresh rate" into sc-dev