Merge "SurfaceFlinger: set refresh rate type when after an attempt to switch" into qt-r1-dev