Merge "dumpstate: avoid ':' in lshal files" into main