Merge "SurfaceFlinger: keep LayerInfo history for inactive layers"