Merge "[SurfaceFlinger] Store current offsets in VSyncModulator." into qt-r1-dev