Merge "SurfaceFlinger: Trace pending BufferStateLayer buffers."