Merge "SurfaceFlinger: Fix PTS on stale buffers"