Merge "Fix deadlock from outside Perfetto mutex" into main