Merge "Revert "Refactor SurfaceFlinger::rebuildLayerStacks""