Merge "SurfaceComposerClient: Fix potential null de-reference in detachChildren"