Merge "Expose Java side for parenting SurfaceControl"