Merge "Reparent DisplayContent layers to SurfaceControl for ActivityView"