Merge "Don't let transition tracing exceptions bubble up" into udc-dev