Merge "SurfaceFlinger: use margin when comparing fps in PhaseOffsets"