Merge "Allow a GLSurfaceView to be reattached to a window."