Merge "SurfaceFlinger: retain the sideband layer information for composition"