Merge "dumpstate.cpp: increase perfetto serialization timeout" into main