Merge "Don't lose stopping state when getting paused confirmation."