Merge "Update dumpstate test to account for Perfetto UI tracing" into main