Merge "Remove unused listener" into udc-dev