Merge "Improve perfetto parser error messaging." into main