Merge "SurfaceFlinger: do not force HDR content to default refresh rate" into qt-r1-dev