Merge "SurfaceFlinger: enable LayerHistoryV2"