Merge "[layertracegenerator] be more resilient to unknown layer ids" into udc-dev