Merge "SurfaceFlinger: propagate phase offsets to scheduler"