Merge "Don't convert conversation senders to the wrong enum" into udc-dev