Merge "Correctly update in-progress events when switching uidStates"