Merge "Fix dumpstate read_file_as_long fd leak" into main