Merge "Refactor SurfaceFlinger::rebuildLayerStacks"