Merge "Add focus support for SurfaceControlViewHost"