Merge "don't restart surfaceflinger when the window manager dies"