Merge "[SurfaceFlinger] correct present time for negative phase offsets" into qt-r1-dev