Merge "dumpstate: include kernel config" into main