Merge "Fix not removing split record in overview after dismissed" into udc-dev