Merge "SurfaceComposerClient: Clean up layer state"