Merge "SurfaceComposerClient: Replace sync transactions with commit callbacks"