Merge "Workaround for handling single device specific state in dump tests" into main