Merge "[content-capture] remove span support, fix leaks" into udc-dev