Fix bug with suspends from different devices getting correlated