Merge "Use different perfetto trigger names for each CUJ"