Merge "Fix tracking of hardware state for dump"