Merge "SurfaceFlinger: Fix PTS on stale buffers" into mnc-dev