Merge "Only hold a weak pointer on SurfaceComposerClients"