Merge "SurfaceFlinger: Remove unnecessary state copy"