Merge "[res] Use fstat() for idmap::IsUpToDate()" into main