Merge "Re-enable PerfettoListener" into main