Merge "Cleanup perfetto proto config" into main