Merge "SurfaceFlinger: Prepare to remove BufferQueueLayer" into sc-dev