Merge "[SurfaceFlinger] Use sf phase offset from CS"